Merge "Update IBatteryPropertiesRegistrar.aidl to support force updates" am: 0aae170841
am: e4d926d9af

Change-Id: Ie8e717f2c5ca38e57d269d9d4d44599b897fb855