Merge "Add null check for DeviceProductInfo" into rvc-dev am: 8fce9febad am: 2b8983bf34

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