Merge changes from topic "fm_freeze" am: c89aabe52d am: 37e69a0901 am: d3f78ae55b am: d412a5d6a3

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1461326

Change-Id: Iabca3dea42615d58790939209be3aca83f586bcc