Merge changes I9b0590b3,Ia9a6f19c am: cd130663dc am: 2ef12995a3 am: 2f6b4a66d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/1689777 Change-Id: I33ef9cb0620092a95269df145b2328193c329730
This commit is contained in: