Merge "Merge "Fix Bluetooth auto turns ON in airplane mode" am: 1b9f4dbd5d am: 4b6e138c0d am: c05648cd5e" into rvc-d1-dev-plus-aosp am: 6628e3260f am: 9fdf307359

Change-Id: Ib1bff65cbed89023e70bd2bbc3ce2597e2165815