Merge "Merge "Update major/minor from longpress sensor" into sc-dev am: ff8bdd88 am: 27d0ca4b" into sc-v2-dev-plus-aosp am: 23f8a7d0

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

Change-Id: I9df0d885a7f113df36a6a63a5724fe64a9a4f9d9