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

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