Snap for 4818837 from 9f91dccce9249917a266c8686ea25b1f67f0d0b2 to pi-release
Snap for 4818837 from 9f91dccce9249917a266c8686ea25b1f67f0d0b2 to pi-release

Change-Id: I96c1a9f178862b10da2624d042ee6137dcf618eb

aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support,aosp-mirror/platform_frameworks_support