Update P24 SVN to 5

Bug: 350826665
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4b85e78912b4030386901f723c4d3969e67e588a)
Merged-In: I806654fb5cc7bb882f8e58bddf4c2cb1d31ae87e
Change-Id: I806654fb5cc7bb882f8e58bddf4c2cb1d31ae87e
3 files changed