Merge "Fix incorrect pos / id for privacy dot" into sc-v2-dev am: 7c4437e7 am: 2eb76288

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

Change-Id: I3cac821b2767740b7dd02c09467d38608394f6a7