Merge "Dump location noteOp with location off" into sc-dev am: 6ad1b191

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70a8b6ab0954109246f1518c1d26b21b2e3f862f