Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev