Merge "[SB Refactor] Add table logging for airplane mode." into tm-qpr-dev am:...

Merge "[SB Refactor] Add table logging for airplane mode." into tm-qpr-dev am: 6221183a am: 6c8ebc1f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20581399



Change-Id: I82de746fd3f4d4e93fd3190220cb0fbc74150c3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>