Merge "Revert "Reduce allocations on location delivery"" into sc-v2-dev am: 679377ad25 am: a1da1d0db7

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

Change-Id: Ic6ad0fa4dfcc9a28591a6d089520308c2255fea2