Merge "Update major/minor from longpress sensor" into sc-dev am: ff8bdd88 am: d7c658cc am: c7669a42

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

Change-Id: I637413799e007c42fc22fdefba7d33eec96b80fd