Update P24 SVN to 4

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