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

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

Change-Id: I2630693d7d85e0480ec49e76b5dbd91f8d7b5d8c