Merge changes from topic "railway_stub" am: 9ff27e5802 am: 8a24cce6d2

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

Change-Id: I8d952cc1c470e1347e3b8ae2984cb3ce44a1b4c9