Merge changes from topic "railway_stub" am: 9ff27e5802 am: 97b6a14173

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

Change-Id: I8d952cc1c470e1347e3b8ae2984cb3ce44a1b4c9
tree: ae151f81817033a2e4eea9e2fffbefd83c001cfa
  1. core/
  2. framework/
  3. framework-t/
  4. service-t/
  5. services/
  6. tests/