Merge "Add null check for DeviceProductInfo" into rvc-dev am: 8fce9febad am: 741f93dec7 am: 89c56db2c4

Change-Id: I82605e532795d1e4027b4c9c85dc31d33c8b935a
tree: 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41
  1. api/
  2. java/
  3. Android.bp