DO NOT MERGE - Merge Android R QPR1

Bug: 172690556
Merged-In: Id57384c385a6d0bc931caf1054812a469daa9ed0
Change-Id: I22db7e344a9a96bfc16e009624b4896625306e83
tree: ef04864bdcfa59e497814684947e191d31da17f8
  1. lib/