tree b9e956d55d9b1b58504269c42bd300539fbaff8a
parent 1d58d45a70c8be214c09a139edee6c7857c5c6ba
parent 9d46564a5f5de82474bb3fbb57dae12a871a34ae
author Weichin Weng <weichinweng@google.com> 1615200159 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615200159 +0000

Merge "Common Criteria mode: Rename Common Criteria mode from NIAP mode. (1/2)" am: e7615e53e7 am: 332d4620ef am: 9d46564a5f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Bluetooth/+/1607908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78cb1f7f2a4efff2deda58f37415722f86e676bf