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

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

Change-Id: I2e549190dac06a9325ad0c8c5e53c4c8c0e3169e